From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Sat, 13 Mar 2010 11:15:58 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7151^2~97
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7c891fb3cbc92e49dfdce54882cb74dd7eb407ff;p=emacs.git

Merge from mainline.
---

7c891fb3cbc92e49dfdce54882cb74dd7eb407ff